Merge "Remove stopship comments and kept logs" into qt-dev