Merge 1.0 branch into master#8

SerafimArts merged 6 commits intomastercycle/database:masterfrom

hotfix/merge-1.0-into-mastercycle/database:hotfix/merge-1.0-into-masterCopy head branch name to clipboard