Merge branch 'devel/flow-expiry' into devel/next