GG-003 Unused parameters are commented.
Merge origin/dev into dev