Merge Madrusec's changes onto Galaxode Fork