merge WB-112 and master
bugfix StandardBookService