Copule more source related modifications
Merge branch 'source_install'