Further fixes for 9113
Merge branch 'fix9113' into develop