Merge "Added missing icon support to SETUP_CALLs setup phase"