Merge commit 'bad1e25ac34e5b0c0cba41a71d136e9c667990a1' into charm