Merge "Remove stopship for idmap2 vendor sdk checking" into qt-dev