Merge "Change prefix based upon mask" into nyc-mr1-dev