GPII-128: Animation tweak
Merge remote-tracking branch 'heidi/GPII-128' into GPII-128