Merge "Check for null executor" into qt-r1-dev