Add FOCUS-9388