Merge branch 'bugfix/server-true-in-prod' into 'develop'