QA-5808 : various fixes after move components