Merge branch 'bb/iso-strict-utc'