port 15031 over again

BS3 commits: 79d0cdbef4e87f2169ae3b892afd4c5670a9c7d7