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

This reverts commit 9429a97be82c6762f0bb792f7b599f18e385c1c6.
Merge branch 'develop'