Merge branch 'branchfrom--juju-charms'