[atrt2] Recommendation 19 and 22