Merge branch 'develop' into lbudginas/#392_part2_simplify_URL_route_build