synchronization with beta branch
Merge branch 'master' into new-book-events
repackaging
comment for new option
Merge branch 'master' into new-book-events
code cleanup: synchronization with beta branch
Merge branch 'master' into new-book-events