DeeDee's pull request with conflicts merged