Handle module dir by splitting camel case
Minor updates
Merge branch 'refs/heads/release'