Merge latest updates from main gluon repo