Merge "Fix mixed up variable in triggering logic" into qt-dev