Merge #3534

Pull request to rebase #3534