solved some bugs
Merge branch 'release/release-002' into develop