Merge tag '0.18_rc1'