A few more commits for ENTESB-1570 on 6.1.x

Backported a few more commits from Guillaume's work on ENTESB-1570 to the 6.1.x branch