Merge "Fix some STOPSHIP logging DO NOT MERGE" into ub-mail-algol