Merge "Issue fix in SDN Controller"