Merge branch 'multichain' into lipid