Merge "Fix common tests on Q and R" into sc-dev