Merge "Start THM outside of the frp block" into qt-dev