Merge commit '7a51b14d9f7f8c48c74ed1787bed3ef83aae6658' * commit '7a51b14d9f7f8c48c74ed1787bed3ef83aae6658': Check if rename of backed up file fails before persisting new changes.
Merge commit '7a51b14d9f7f8c48c74ed1787bed3ef83aae6658' * commit '7a51b14d9f7f8c48c74ed1787bed3ef83aae6658': Check if rename of backed up file fails before persisting new changes.