upstream changes and python import improvement