Several catchup commits from Claudyus' repo