Merge "Add safety checks for volume alias mappings" into main