Actually pass the parameter to the method
Merge branch 'master' into imp_6_2