[MFC-288] MFC-288