Merge pull request #4162 from pks-t/pks/merge-source-fixes merge_driver: fix const-correctness for source getters