TODO note on migration from develop to staging S-48655