Merge "Fix violation in DecorContext" into tm-qpr-dev