Now outputing the discharge disposition code if it is present
Merge remote-tracking branch 'cy/develop' into develop