FACES-1883 checking in again after rebasing