Merge remote branch 'hdt-pierre/fixes-for-3.86'