Merge "Fix security issue" into rvc-qpr-dev