conditional support for auto payload insertion