Merge pull request #3080 from BrzVlad/feature-enable-conc-master