merge local changes into develop (0.18)