[#43634713] Fix file control population
Merge branch 'manti-by-dev' of github.com:marco-manti/M2_micro into manti-by-dev