Fix problem in PROD (test with FileWriter)
Merge remote-tracking branch 'origin/master'