Merge "Synchronize to kill application when clear data" into main