Merge 0.18 into Production

Merge 0.18 into staging. Can you please complete @henare