Merge "Add series support and revert previous commit that included build charm rather than layer"