Fully behavior compability with older Shower core
conflicts resolved