Squashed commit of dynflow branch
Temporary workaround to be able to build with old dynflow