Merge "Update call to deprecated Graphite accessor" into main