[TASK] Merge development->staging to create 1.8.5