Merge with BorisYankov definitions