Block device mapping

Fixes #18493.

Addresses #16921.