* commit 'ea6bf3628140283df24f2652b686d083b0d31ed9': Deep clone settings for system package update DO NOT MERGE