Merge remote-tracking branch 'refs/remotes/vsingleton/FACES-1600' into 3.1.x