JBDSIS 701CR1 - issue fixes