Bring in line with the latest Platform 13.1 changes