JBTM-1765 Updated to make sure we are using Andrew Dinns patch of emma JBTM-826