Fixed compile error
Made ResyncDatabase an object
Merge branch 'hotfix/CLAIM-172_gpiMaint' into develop