synchronization with beta branch
Merge branch 'master' into new-book-events
imports cleanup
Merge branch 'master' into new-book-events