merged hotsoft-desenv4-master