Cost
Fixed #1500
Merge branch 'master' into workshop