Merge "Add test cases for regression issue"