FORGE-1767: Addon New UI Command improvements