Stage3 bug fix
Merge commit '2db89a986b902dad2bdeb1c98fa36d5e29cdf047' into develop