merge from devvel hotfix & fixbody margin issue -dye