fix-1 finished
Merge branch 'fix-1' into dev