T4850

Merged Diego Barreto requested to merge T4850 into 12.0-stage