JBTM-1559 Updated to make it easier to read what is happening