L4IP changes for always/1shot