ECMS-6336 check and remove old data if 'override' parameter is true
Merge commit '9c424cfd5f0a2e2b12ee5778589ad53b5327ad46' into HEAD