BK-1169 Exception when trying to access published book
Merge branch 'BK1169' into 2.0