Merge "Synthetic target tweaks" into main