Adyax test fix errors
Merge branch '001-cct-panels-style' into develop