Merge branch 'feature/pkg-component' of https://gitlab.nektar.info/dmoxey/nektar into feature/pkg-component