MIFOSX-518: capture alternative working date

Vishwas,

This pull request includes changes for MIFOSX-518.

Regards
Ashok