YOMO-7514 after GL's review