Merge "Fix docker user settings backup"