Merge master into feature/stabilization.
SOC-4034 | backport from 4.0.x and resolved SOC-4096
Merge feature/stabilization into master