removed @todos and added @file
Merge branch '7.x-1.x-dev' into 7.x-1.x