GNR-4 cleanup
GNR-4 optimized login and data handling
Merge branch 'hotfix/v1.0.2'