fix assert IDs related to back-port of 2.2.5 #283
Merge branch 'diverge'