Merge branch 'master' into branch_update_from_changes
set global variables to NULL before use

Issue: GCP-1029

Reviewer: Dennis
set global variables to NULL before use and change schema version

Issue: GCP-1029

Reviewer: Dennis
Merge branch 'branch_update_from_changes'