Merge "Update documentation to reflect the old approach not working." into ics-mr1