Copy from 1.6.x Soartex Modded repository, will be delted after accepting my push request