apply requested  changes
Merge branch 'development' into v8.3