Merge remote-tracking branch 'gfiber-internal/nightingale' into nightingale_merge