Merge remote branch 'devel' into work/1.7.0.2