Backport usefull commits from MR976 into develop

There are some dual commits in this MR as develop has derived from release-8.1. This new MR is for develop in order to merge only the usefull commits