* commit 'ae336a08ddc402372e3ba16dfaf50cfb837cf74d': Retain configuration change info and sync access.