DF-2587 DF-2687 fixed