OPENAM-4154 FR-442
Integrating AME-2372 branch part II: * Moving resources to their correct locations