master: 349185481088c015f92c846792c90b851a457ac0 Add note on feature gate