Merge "Update Redbull SVN to 21" into rvc-qpr-dev