ENG-6674 and ENG-6675 resolved