Correct functional test to send currentcost message
Merge branch 'release/v2.1.2'