changes from prerelease src_CSA_DiL copied to devel