Merge "Add calls to super methods to activate coverage tool" into sc-dev