Merge remote-tracking branch 'skunk/o8.1' into o8.1-gsi-dev