Merge branch 'rpb-255-null' of https://github.com/hbz/rpb into main

Merge branch 'rpb-255-null' of https://github.com/hbz/rpb into main #598