Added patch for BACKLOG-845 and some other small changes