Bring inline with latest tagged releases