fend-989/1039 corrections
Merge branch 'master' into dev/fend-989_take2
Merge remote-tracking branch 'origin/dev/fend-989' into release/2.6.4rc