Task #679320 by cytefx,Pasqualle: Initial port of the D6 code to D7, this will be a dev release only, forgot to add the new files.