Merge remote-tracking branch 'refs/remotes/kylestiemann/FACES-1477' into 3.1.x