Reapply fixes for Bug #2110 and Bug #2271
Feature #2568: RBD format 1 as default. Handle properly both formats