**Summary:** Since we are trying to cover all of new features with tests, this #2863 pull request needs tests.