Comaptibility with refinery Cms master

ref 5b67ae2259c89bc17975c6568318edbaede3562f