ChrisHines Merge branch 'release/v1.8.1'