Merge "Refactored field classification workflow to not hold locks when calling ExtServices." into qt-dev