Merge v9 changes into Slim