Add missing lines and equipments (cherry picked from commit 94186a5e79d5d3fe29ac80245992af6365999a93)