Merge remote-tracking branch 'arma/bug24894' into maint-0.3.2