Merge pull request #2394 from nabinhait/5_develop

Credit days validation fixes