PR #396 - decocms/mcps