@MrZYX Please give a look. I need to get this merged before 30th September. (Before RGSoC comes to an end) ;)