Merge "Fixed patch-coverage generation" into devel/master