prepared for tests
merged from master