Sync with evaleev/BTAS after Ordinal refactoring.