PR #2858 - decocms/studio