Merge from Tibor main branch.
Some GCM updates from Tibor main branch. QR login.