RESOLVE CORE-1182 **What** Remove unnecessary extra manager fork that need reconciliation under the hood