Incorporate changes from e4ds-template