Merge "Test code for Bug #2545"