Initial commit with v0.10.2_fix2