Resolved SDOCM00101586. Added test cases to cover resolved issued