Merge #525 to 2.4