PR #402 - decocms/mcps