Squashed commit of dynflow branch