QA-5808 : move local views from bootstrap components
Merge remote-tracking branch 'origin/master'