Merge branch 'address-masking'