DEVIDM-93: More Use Cases and Fixes.