merge master changes
add port statistics