Merge "MAP MCE null pointer" into qt-dev