Merge "Fix dismiss target magnetization" into main