MIFOSX-518: capture alternative working date

Keith,

This commit includes MIFOSX-518 changes.

Regards
Ashok