LG1710

Hello, could you merge this PR in the master and make a new tagged version, thx

Hello, could you merge this PR soon to use in a new tagged version, thx