Merge branch 'on-waves/nat-alloc-bsc-endpoints'