SD AMSv2: fix r29625