Merge "BUG-2082: add integration test"