Integrate Release 0.9.16 to master