Merge "Update recent indicators to match spec." into main