merged from development (11675)
 Pre build merge check in (11847)