forward port commit 7608 for a3