Insert always-on defaults
layer in correct spot
#6526
Merged
defaults
layer in correct spot
#6526