update_fold crashes unless params are reversed
Merge branch '3.18' into 3.18-voxter