Cherry Picked Stephens commit to develop branch