BK-1014: More updates for Booktype 2.0