Merge "Changes to support automated test framework"