Merge pull request #1959 from botverse:2.4