Merging in changes from rajbot and manuq

ping @rajbot @manuq