[Build] Applied solution updates from Zero