Cherry-pick changes from master
Cherry-pick changes from master

MiczFlor/Booktype,btat/Booktype,danielhjames/Booktype,kronoscode/Booktype,rob-hills/Booktype,eos87/Booktype,sourcefabric/Booktype,okffi/booktype,okffi/booktype,rob-hills/Booktype,rob-hills/Booktype,sourcefabric/Booktype,ride90/Booktype,sourcefabric/Booktype,MiczFlor/Booktype,okffi/booktype,aerkalov/Booktype,danielhjames/Booktype,eos87/Booktype,olegpshenichniy/Booktype,eos87/Booktype,kronoscode/Booktype,olegpshenichniy/Booktype,MiczFlor/Booktype,ride90/Booktype,MiczFlor/Booktype,eos87/Booktype,kronoscode/Booktype,okffi/booktype,sourcefabric/Booktype,ride90/Booktype,eos87/Booktype,btat/Booktype,btat/Booktype,olegpshenichniy/Booktype,olegpshenichniy/Booktype,olegpshenichniy/Booktype,ride90/Booktype,danielhjames/Booktype,aerkalov/Booktype,MiczFlor/Booktype,sourcefabric/Booktype,ride90/Booktype,kronoscode/Booktype,danielhjames/Booktype,rob-hills/Booktype,okffi/booktype,btat/Booktype,danielhjames/Booktype,kronoscode/Booktype,aerkalov/Booktype