3.2
Fix Sonar issue s2293 The diamond operator ('<>') should be used (#14005)
Make config builder more comprehensive (#13556)