#POULPE-481 Added package-info and removed unnecessary comments.
Merge remote-tracking branch 'origin/master'