Resolve set messages to undefined
Shorten pending promise chains
Merge kriskowal/master into master