CB-5188:
Merge remote-tracking branch 'cordova/dev' into dev