Update Gluon packages
Update gluon packages
Merged latest upstream changes