Merge remote-tracking branch 'kali/add-readme-to-manifest' into develop