Merge "Remove unnecessary condition" into sc-qpr1-dev