Squashed merge of dynflow branch