Merge "Fix violation in DecorContext"