452188 Delay dispatch until content optimisation
452188 Delay dispatch until content optimisation

Added module and xml support