master_v0.9.5-B17