Config updates from 11.2.A.0.21