Merge "Bug 1569 - [DEV] Too small variable for OF-Port-Number"