Merge "Merge commit '8241b9c0529228b4b86d88b1a6076fb9f97e4a99' (V_9_6_P1)" into main