PR #3054 - decocms/studio