PR #381 - decocms/mcps