fixes for FACES-1532
Merge branch 'FACES-1532' into testing