Enhancements as a result from upgrade to 7.0.5 / 7.1.2

Enhancements as a result from upgrade to 7.0.5 / 7.1.2 #503