[#2673] Build changes.