Merge Rlon-Develop into Develop

What do y'all think of these changes?