Merge fixes from dev-ion-doc feature branch back to main (#497)

Merge fixes from dev-ion-doc feature branch back to main (#497) #148