Porting 2.8.6 -> 2.8.7 SQL upgrade