rAKA/master-stable

bugfixes/heat_virtual_d…