use atomic write instead of "normal creation"
Merge origin/master