Merge branch 'bugfix/file-consistency-prod' into 'develop'