Merge "Add classes to Dynamic STS" into rvc-dev