Various backportings
More backportings
Removed outdated scripts
Merge pull request #1982 from fstagni/backPortingFromIntegrationTov6r12-2

[v6r12] Back porting from integration tov6r12