Submit crashreport

This is to uplift master changes to v2.0, please review