Fix issues related to deployment of upcoming v4-release