Merge "Split slave-bind mount into two."