jweatherford-development-patch-85815