Sync with evaleev/BTAS before Ordinal refactoring will take place.