Latest Release: #831 - The driving force behind this