Trapping wiki dirty form navigation
Merge branch '4.31.1'