813: Fix issues related to deployment of upcoming v4-release (OPENED)

Task-Url: #813