Rapporteur and drafting work for Q.J/16