Merge recent changes from BPT into the transit branch