commit for merge
Merge remote-tracking branch 'origin/master'
cai thien flow cho GPS <—> loading <—> snapshot