fix meal sync problem
Merge branch 'changes' into unstable