Fixes
Merge branch 'lr6.1-lr6.2_migration' of https://github.com/jintrone/XCoLab into lr6.1-lr6.2_migration
LR6.2 bug fixes