FQA-500/Restructure Ecms common functions