Merge remote-tracking branch 'dev/master' into jack_dev
prevent mutiple submit
Merge remote-tracking branch 'origin/master' into jack_dev
Bump memories version