Hotifx-1701 Develop Update