Speculative merge of itemflow2 fixes