PR #2857 - decocms/studio