Merge branch 'release/wanna_test_dynamoDB'
removed some parts to test dynamoDB first