Merge "Fix ClientMode initialization order" into qt-dev