Hotfix/add manifest

master/develop