Fix to make this script consistent with new slot API
Merge branch 'u/pgee/DM-1071'