Merge pull request #1 from daniel-dgi/7.x

Porting from 6.x -> 7.x