BUG-865: add proper nullness annotations