Added all files from v0.31 release