Fixed handling of NULLs in bogus comment state
auto-merge staging into master