PR #403 - decocms/mcps | cubic