[21.5] move comment