T9/hotfix/requirements