A few more changes.
Cannot remove custom flag settings for some reason.
Merge remote-tracking branch 'origin/master'