Kindle

@dmolsen cherry-picked your commits after rebasing. Can you check this is still good? Thanks!