upgrade to 1.5.0.preview.2 plus a few commits