[TASK] Merge staging...development to create 1.8.5