Build: #2920 was successful Changes by Andrey Volk and Serj Serj