this change should not be part of this story -- should it?  Did you merge in the ivory_13_18_acu129277_vscale_support_v6.0 branch before making the pull request?