Updated with contents from version 8.5.2