Re: #1703 - optimisation & code tidy
Merge branch 'ticket-1703' into develop
Merge branch 'develop' into test