development jweatherford-development-patch-85815 master