[BUG #7379] Removed deprecated code from 3.0
Merge branch 'master' into removedDeprecatedFrom3_0