Merge branch 'fix/mutes.json-emptyarray' into 'develop'