Merge branch 'replica_ft' of charmgit:charm into replica_ft