CLC-3692 Improve dev dump procedure