merged changes from main branch for gs-3.14