Copied over latest changes from affiliated package template