Merge "Revert "TEMP add missing remap log, reduce log spam"" into sc-dev