Updated to #2771 (1.5.2 Beta)