OOIION-1819: Fix facepage issues
Merge pull request #1989 from mmeisinger/fix1819_face_r2

OOIION-1819: Fix facepage issues