Merge "Fix class initialization issue" into qt-r1-dev