PR #393 - decocms/mcps | cubic