Missed a couple of commits to match up with Zuluru #1342 (0d9d1c900a)