Update to #2744 (1.5.1 R2 Dev)