bulk update to 1.8.4