Fuel 777 vvk merged dpyzhov

Merge fuel-777 into your branch + fixes for cluster_*.pp conflicts