Merge remote-tracking branch 'refs/remotes/vsingleton/FACES-1570' into 3.2.x