Draft: codefreeze-deferred-merge-master

This merge request contains hotfixes that have already been merged to master for SLB internal deployments, but postponed on osdu gitlab for code freeze.