Merge 0.18 into Production

Merge 0.18 into Production. @henare can you review please