merge commits from original #2