manual merge with issue-198 If data has not changed - do not write it to system