Pull in dev changes from Scott and John