Add missing configs and advance to V2.21