2.9.3-RC2

review by @jsuereth