Merge latest updates from main gluon repo

Now with the correct direction of the pull request ;)