Various housekeeping etc

Refer to each individual commit and check the updates of the RT queue