Update to #2671 (1.5 Developement)