FACES-1898 adjusted rebase