Merge pull request #3766 from BrzVlad/feature-default-conc