upgrade known issue from 3.6.1

(cherry picked from commit 7e60530b710cbe33a4a0707fa55850517b9277b9)