Suggestions from @jennybc
Very rough debugging with lldb/gdb draft
Merge remote-tracking branch 'origin/master'
Re-do merged change