GPII-2613:  Merge upstream master GPII branch into GPII-2613
GPII-2613:  Merge upstream master GPII branch into GPII-2613

gloob/windows,gloob/windows,javihernandez/windows,GPII/windows,javihernandez/windows,gloob/windows,GPII/windows,gloob/windows