Fix gemset LWRP
Finish 1.3.5