PR #346 - decocms/mcps