fix: resolve core component acceptance findings

fix: resolve core component acceptance findings #1950