Merge "Revert "adding latest release charm support.""