upstream changes on 0.0.6