Merge "Fixed wrong QS padding" into rvc-dev