Updates

8115/8118

Fixed

  • Fixed earlier reported issues