Add Hotfix1 updates to develop