acu140093 - [block_device, db] Backup type fixes