Prepared for tests.
prepared for tests
merged from master