Merge "Proper directionality for entry points table"