Merge branch '1921_lslR_fix'