BK-1036 Draft page throws error when book is empty
Merge branch 'BK1036' into 2.0