PMO-2652 merge changes from master into 1.8.x branch manually