Merge release info from 1.8.4