Revert "Merge branch 'feature/showrca2014' into develop"

This reverts commit e05f71d145f0cb3eee1b797cddd90643227f7e7e, reversing
changes made to 81e892c7412edd5f2bd69e5fdbdc7eb7672b7970.
Merge branch 'develop'