Further changes to Sync and MaidManager Service.
Merge remote-tracking branch 'origin/sync' into db_transfer