resolves merge conflict between #4071 / #4072