migration bug fixed
Merge branch 'dev' into LAMBDA-173