Merge branch 'flower-offload'