Merge branch 'feature/showrca2014' into develop

This reverts commit 0166c81d4d4c032729b03def753023cef48c257b.