Change in mom[master]: Add support for optional collector fields and (null expr) test