Merge pull request #3110 from BrzVlad/fix-complex-conc-scan