Add Mayors changes
Merge branch 'New_Simba' of https://github.com/SRL/SRL-6 into New_Simba