Merging back #bicycling specific changes

^