Merged master lr6.1-6.2 branches