PR #387 - decocms/mcps