[skip] update changes for bugs fixed in recent commits
Fix improper handling of MNC_ZERO

 - add test
 - patch ResConfigFlags