Incorporate latest changes from e4ds-template project