upgrade known issue from 3.6.1