Merge "Change UUI port config"