Pulling in latest upstream changes
Ignore some configs and layouts
config changes