OM-162: add experimental support for -empty