Fixed missing return statement
Merge branch 'feature/showrca2014' into staging