Re: [PATCH 0/2] QA work and macro modification