Merge "Prepare pass_through mounts"