Merge "Make String DIRECT_MANIPULATION visible for testing" into rvc-qpr-dev