Merge "Use logical path to handle different dm target per boot" into main