c24-tj

Results 1 issues of c24-tj

This PR implements #2484