Initial commit of v0.5-4 code.