Syncing with mainline configs

Been fairly busy in the stable branch!