Merged in @kirill-konshin 's changes
Releasing 2.4.0