[[ Bug 13450 ]] Apply previous bugfix 11485 to refactor branch