Conflict resolution :)
Resolving conflicts from merge of 73732244d6fadd47129d65bc61e12be4e6ed114d to 3.8.14.2 branch