Merge "Fix enumerate corner case" into qt-dev