WIP: merge into BS random ports commit