diff --git a/package-lock.json b/package-lock.json
index 4995bef46..ba00ed72c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.6.5",
+    "version": "0.7.1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@devtron-labs/devtron-fe-common-lib",
-            "version": "0.6.5",
+            "version": "0.7.1",
             "license": "ISC",
             "dependencies": {
                 "@types/react-dates": "^21.8.6",
diff --git a/package.json b/package.json
index 8b3b3cf5e..535ff33fd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.6.5",
+    "version": "0.7.1",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
diff --git a/src/Common/CIPipeline.Types.ts b/src/Common/CIPipeline.Types.ts
index 86418dfde..ea92fb660 100644
--- a/src/Common/CIPipeline.Types.ts
+++ b/src/Common/CIPipeline.Types.ts
@@ -170,7 +170,6 @@ export interface StepType {
     inlineStepDetail?: InlineStepDetailType
     pluginRefStepDetail?: PluginRefStepDetailType
     triggerIfParentStageFail: boolean
-    isMandatory?: boolean
 }
 
 export interface BuildStageType {
diff --git a/src/Common/Policy.Types.ts b/src/Common/Policy.Types.ts
index f99dcfb45..b18617026 100644
--- a/src/Common/Policy.Types.ts
+++ b/src/Common/Policy.Types.ts
@@ -14,34 +14,35 @@
  * limitations under the License.
  */
 
-import { PluginDataStoreType } from '../Shared'
+import { PipelineFormType } from '@Pages/Applications'
+import { PluginDataStoreType, PluginDetailPayloadType, ResourceKindType } from '../Shared'
 import { VariableType } from './CIPipeline.Types'
 import { ServerErrors } from './ServerError'
-import { ResponseType } from './Types'
 
 export enum ApplyPolicyToStage {
     PRE_CI = 'PRE_CI',
     POST_CI = 'POST_CI',
+    /**
+     * @deprecated in mandatory plugin policy v2
+     */
     PRE_OR_POST_CI = 'PRE_OR_POST_CI',
+    PRE_CD = 'PRE_CD',
+    POST_CD = 'POST_CD',
 }
 
+// FIXME: The name build is getting is used in CDPipeline.
+// This enum is mapping values from BuildStageVariable
 export enum PluginRequiredStage {
-    PRE_CI = 'preBuildStage',
-    POST_CI = 'postBuildStage',
-    PRE_OR_POST_CI = 'PRE_OR_POST_CI',
+    PRE_STAGE = 'preBuildStage',
+    POST_STAGE = 'postBuildStage',
+    PRE_OR_POST_STAGE = 'PRE_OR_POST_CI',
 }
 
 export interface DefinitionSourceType {
-    projectName: string
-    isDueToProductionEnvironment: boolean
-    isDueToLinkedPipeline: boolean
-    policyName: string
-    appName?: string
-    clusterName?: string
-    environmentName?: string
-    branchNames?: string[]
-    ciPipelineName?: string
+    policyNames: string[]
+    linkedCIPipelineNames?: string[]
 }
+
 export interface MandatoryPluginDetailType {
     id: number
     parentPluginId: number
@@ -52,7 +53,7 @@ export interface MandatoryPluginDetailType {
     applied?: boolean
     inputVariables?: VariableType[]
     outputVariables?: VariableType[]
-    definitionSources?: DefinitionSourceType[]
+    definitionSources?: DefinitionSourceType
 }
 export interface MandatoryPluginDataType {
     pluginData: MandatoryPluginDetailType[]
@@ -66,23 +67,67 @@ export interface ProcessPluginDataReturnType {
     mandatoryPluginsError?: ServerErrors
 }
 
+export type ProcessPluginDataCIParamsType = {
+    resourceKind: ResourceKindType.ciPipeline
+    ciPipelineId: number
+    /**
+     * Comma separated branch names used for v1 api
+     * For v2 format is [branchName1],[branchName2]
+     */
+    branchName?: string
+
+    envName?: never
+}
+
+export type ProcessPluginDataCDParamsType = {
+    resourceKind: ResourceKindType.cdPipeline
+    envName?: string
+
+    ciPipelineId?: never
+    branchName?: never
+}
+
+export type ProcessPluginDataParamsType = {
+    formData: PipelineFormType
+    pluginDataStoreState: PluginDataStoreType
+    appId: number
+    appName: string
+    /**
+     * Would be sent in case we have to get data for steps
+     */
+    requiredPluginIds?: PluginDetailPayloadType['pluginId']
+} & (ProcessPluginDataCIParamsType | ProcessPluginDataCDParamsType)
+
 export enum ConsequenceAction {
+    /**
+     * This is used if the policy is enforced immediately.
+     */
     BLOCK = 'BLOCK',
+    /**
+     * This is used if the policy will be enforced after a certain timestamp.
+     */
     ALLOW_UNTIL_TIME = 'ALLOW_UNTIL_TIME',
+    /**
+     * This is used if the policy is not enforced yet (just to show waring).
+     */
     ALLOW_FOREVER = 'ALLOW_FOREVER',
 }
 
-export interface ConsequenceType {
-    action: ConsequenceAction
-    metadataField: string
-}
+export type ConsequenceType =
+    | {
+          action: Exclude<ConsequenceAction, ConsequenceAction.ALLOW_UNTIL_TIME>
+          metadataField?: never | null
+      }
+    | {
+          action: ConsequenceAction.ALLOW_UNTIL_TIME
+          /**
+           * Denotes the time till which the policy enforcement is relaxed
+           */
+          metadataField: string
+      }
 
 export interface BlockedStateData {
     isOffendingMandatoryPlugin: boolean
     isCITriggerBlocked: boolean
     ciBlockState: ConsequenceType
 }
-
-export interface GetBlockedStateResponse extends ResponseType {
-    result?: BlockedStateData
-}
diff --git a/src/Common/Types.ts b/src/Common/Types.ts
index d8228f764..f87e43f8f 100644
--- a/src/Common/Types.ts
+++ b/src/Common/Types.ts
@@ -18,8 +18,15 @@ import React, { ReactNode, CSSProperties, ReactElement } from 'react'
 import { Placement } from 'tippy.js'
 import { UserGroupDTO } from '@Pages/GlobalConfigurations'
 import { ImageComment, ReleaseTag } from './ImageTags.Types'
-import { ACTION_STATE, DEPLOYMENT_WINDOW_TYPE, DockerConfigOverrideType, SortingOrder, TaskErrorObj } from '.'
-import { RegistryType, RuntimeParamsListItemType, Severity } from '../Shared'
+import { MandatoryPluginBaseStateType, RegistryType, RuntimeParamsListItemType, Severity } from '../Shared'
+import {
+    ACTION_STATE,
+    ConsequenceType,
+    DEPLOYMENT_WINDOW_TYPE,
+    DockerConfigOverrideType,
+    SortingOrder,
+    TaskErrorObj,
+} from '.'
 
 /**
  * Generic response type object with support for overriding the result type
@@ -450,12 +457,12 @@ export interface ArtifactReleaseMappingType {
 }
 
 export interface CDMaterialListModalServiceUtilProps {
-    artifacts: any[],
-    offset: number,
-    artifactId?: number,
-    artifactStatus?: string,
-    disableDefaultSelection?: boolean,
-    userApprovalConfig?: UserApprovalConfigType,
+    artifacts: any[]
+    offset: number
+    artifactId?: number
+    artifactStatus?: string
+    disableDefaultSelection?: boolean
+    userApprovalConfig?: UserApprovalConfigType
 }
 
 export interface CDMaterialType {
@@ -552,7 +559,7 @@ export interface DownstreamNodesEnvironmentsType {
     environmentName: string
 }
 
-export interface CommonNodeAttr {
+export interface CommonNodeAttr extends Pick<MandatoryPluginBaseStateType, 'isTriggerBlocked' | 'pluginBlockState'> {
     connectingCiPipelineId?: number
     parents: string | number[] | string[]
     x: number
@@ -602,15 +609,10 @@ export interface CommonNodeAttr {
     approvalUsers?: string[]
     userApprovalConfig?: UserApprovalConfigType
     requestedUserId?: number
-    showPluginWarning?: boolean
+    showPluginWarning: boolean
     helmPackageName?: string
     isVirtualEnvironment?: boolean
     deploymentAppType?: DeploymentAppTypes
-    isCITriggerBlocked?: boolean
-    ciBlockState?: {
-        action: any
-        metadataField: string
-    }
     appReleaseTagNames?: string[]
     tagsEditable?: boolean
     isGitOpsRepoNotConfigured?: boolean
@@ -793,7 +795,7 @@ export interface CDStageConfigMapSecretNames {
     secrets: any[]
 }
 
-export interface PrePostDeployStageType {
+export interface PrePostDeployStageType extends MandatoryPluginBaseStateType {
     isValid: boolean
     steps: TaskErrorObj[]
     triggerType: string
@@ -831,6 +833,8 @@ export interface CdPipeline {
     preDeployStage?: PrePostDeployStageType
     postDeployStage?: PrePostDeployStageType
     isProdEnv?: boolean
+    isGitOpsRepoNotConfigured?: boolean
+    isDeploymentBlocked?: boolean
 }
 
 export interface ExternalCiConfig {
diff --git a/src/Pages/GlobalConfigurations/BuildInfra/Descriptor.tsx b/src/Pages/GlobalConfigurations/BuildInfra/Descriptor.tsx
index 96839067b..a406bbb9d 100644
--- a/src/Pages/GlobalConfigurations/BuildInfra/Descriptor.tsx
+++ b/src/Pages/GlobalConfigurations/BuildInfra/Descriptor.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { DescriptorProps } from './types'
+import { BuildInfraDescriptorProps } from './types'
 import { BreadCrumb, DOCUMENTATION } from '../../../Common'
 import { BUILD_INFRA_TEXT } from './constants'
 import { InfoIconTippy } from '../../../Shared'
@@ -25,7 +25,7 @@ const Descriptor = ({
     children,
     tippyInfoText,
     tippyAdditionalContent,
-}: DescriptorProps) => (
+}: BuildInfraDescriptorProps) => (
     <div className={`flexbox dc__content-space dc__align-items-center w-100 ${additionalContainerClasses ?? ''}`}>
         <div className="flexbox dc__align-items-center dc__gap-4">
             <BreadCrumb breadcrumbs={breadCrumbs} />
diff --git a/src/Pages/GlobalConfigurations/BuildInfra/types.tsx b/src/Pages/GlobalConfigurations/BuildInfra/types.tsx
index 519222311..373deca6f 100644
--- a/src/Pages/GlobalConfigurations/BuildInfra/types.tsx
+++ b/src/Pages/GlobalConfigurations/BuildInfra/types.tsx
@@ -74,7 +74,7 @@ export enum BuildInfraProfileVariants {
     CUSTOM = 'CUSTOM',
 }
 
-export interface DescriptorProps {
+export interface BuildInfraDescriptorProps {
     /**
      * In case we want to restrict the max-width
      */
diff --git a/src/Shared/Components/DatePicker/DateTimePicker.tsx b/src/Shared/Components/DatePicker/DateTimePicker.tsx
index 515f04975..ccdaf459c 100644
--- a/src/Shared/Components/DatePicker/DateTimePicker.tsx
+++ b/src/Shared/Components/DatePicker/DateTimePicker.tsx
@@ -69,9 +69,11 @@ const DateTimePicker = ({
 
     return (
         <div className="date-time-picker">
-            <label className={`form__label ${required ? 'dc__required-field' : ''}`} htmlFor={id}>
-                {label}
-            </label>
+            {label && (
+                <label className={`form__label ${required ? 'dc__required-field' : ''}`} htmlFor={id}>
+                    {label}
+                </label>
+            )}
             <div className="flex left dc__gap-8">
                 <SingleDatePicker
                     id={id}
diff --git a/src/Shared/Components/FeatureDescription/FeatureTitleWithInfo.tsx b/src/Shared/Components/FeatureDescription/FeatureTitleWithInfo.tsx
index c1584e7c7..45d65d6d5 100644
--- a/src/Shared/Components/FeatureDescription/FeatureTitleWithInfo.tsx
+++ b/src/Shared/Components/FeatureDescription/FeatureTitleWithInfo.tsx
@@ -35,6 +35,7 @@ const FeatureTitleWithInfo = ({
     docLinkText = 'View Documentation',
     dataTestId = 'feature-title-with-info',
     additionalContent,
+    showInfoIcon = false,
 }: DescriptorProps) => {
     const [showFeatureDescriptionModal, setShowFeatureDescriptionModal] = useState(false)
     const onClickInfoIcon = () => {
@@ -64,10 +65,14 @@ const FeatureTitleWithInfo = ({
                 </div>
             )
         }
-        if (breadCrumbs?.length > 0) {
+        if (breadCrumbs?.length > 0 || showInfoIcon) {
             return (
                 <div className="flexbox dc__align-items-center dc__gap-4">
-                    <BreadCrumb breadcrumbs={breadCrumbs} />
+                    {showInfoIcon && breadCrumbs?.length === 0 ? (
+                        <span className="fs-16 fw-6 cn-9 lh-32">{title}</span>
+                    ) : (
+                        <BreadCrumb breadcrumbs={breadCrumbs} />
+                    )}
                     <ICHelpOutline className={`${iconClassName} icon-dim-20 cursor fcn-6`} onClick={onClickInfoIcon} />
                 </div>
             )
diff --git a/src/Shared/Components/FeatureDescription/index.ts b/src/Shared/Components/FeatureDescription/index.ts
index 2cb9f1ab1..6ff97bf34 100644
--- a/src/Shared/Components/FeatureDescription/index.ts
+++ b/src/Shared/Components/FeatureDescription/index.ts
@@ -16,3 +16,4 @@
 
 export * from './FeatureDescriptionModal'
 export { default as FeatureTitleWithInfo } from './FeatureTitleWithInfo'
+export * from './types'
diff --git a/src/Shared/Components/FeatureDescription/types.ts b/src/Shared/Components/FeatureDescription/types.ts
index d874b3588..d963293a2 100644
--- a/src/Shared/Components/FeatureDescription/types.ts
+++ b/src/Shared/Components/FeatureDescription/types.ts
@@ -38,4 +38,10 @@ export interface DescriptorProps extends FeatureDescriptionModalProps {
     docLinkText?: string
     dataTestId?: string
     additionalContent?: ReactNode
+    /**
+     * If true, the info icon is displayed which when clicked shows the feature description modal
+     *
+     * @default false
+     */
+    showInfoIcon?: boolean
 }
diff --git a/src/Shared/Components/FilterChips/FilterChips.component.tsx b/src/Shared/Components/FilterChips/FilterChips.component.tsx
index e39a9373b..63ea141eb 100644
--- a/src/Shared/Components/FilterChips/FilterChips.component.tsx
+++ b/src/Shared/Components/FilterChips/FilterChips.component.tsx
@@ -15,7 +15,7 @@
  */
 
 import { ReactComponent as CloseIcon } from '../../../Assets/Icon/ic-close.svg'
-import { noop } from '../../../Common'
+import { noop, Tooltip } from '../../../Common'
 import { FilterChipProps, FilterChipsProps } from './types'
 
 const FilterChip = ({
@@ -45,7 +45,9 @@ const FilterChip = ({
                         <span className="dc__divider h-24" />
                     </>
                 )}
-                <span className="dc__ellipsis-right">{valueToDisplay}</span>
+                <Tooltip content={valueToDisplay}>
+                    <span className="dc__ellipsis-right dc__word-break dc__mxw-150">{valueToDisplay}</span>
+                </Tooltip>
                 {showRemoveIcon && (
                     <button
                         type="button"
diff --git a/src/Shared/Components/InfoIconTippy/InfoIconTippy.tsx b/src/Shared/Components/InfoIconTippy/InfoIconTippy.tsx
index 1af043d41..2306d7955 100644
--- a/src/Shared/Components/InfoIconTippy/InfoIconTippy.tsx
+++ b/src/Shared/Components/InfoIconTippy/InfoIconTippy.tsx
@@ -30,9 +30,11 @@ const InfoIconTippy = ({
     placement = 'bottom',
     dataTestid = 'info-tippy-button',
     children,
+    headingInfo,
 }: InfoIconTippyProps) => (
     <TippyCustomized
         theme={TippyTheme.white}
+        headingInfo={headingInfo}
         className="w-300 h-100 dc__no-text-transform"
         placement={placement}
         Icon={HelpIcon}
diff --git a/src/Shared/Components/Plugin/PluginCard.tsx b/src/Shared/Components/Plugin/PluginCard.tsx
index 60ee27a04..62c022c0c 100644
--- a/src/Shared/Components/Plugin/PluginCard.tsx
+++ b/src/Shared/Components/Plugin/PluginCard.tsx
@@ -33,6 +33,8 @@ const PluginCard = ({
         pluginDataStore.pluginVersionStore[latestPluginId]
 
     const handleSelection = (e: React.MouseEvent | React.KeyboardEvent) => {
+        // Added to ensure that the event is not bubbled to the div in case of click on the checkbox
+        e.preventDefault()
         if ('key' in e && e.key !== 'Enter' && e.key !== ' ') {
             return
         }
diff --git a/src/Shared/Components/Plugin/PluginImageContainer.tsx b/src/Shared/Components/Plugin/PluginImageContainer.tsx
index 49b73647e..141d9c1b4 100644
--- a/src/Shared/Components/Plugin/PluginImageContainer.tsx
+++ b/src/Shared/Components/Plugin/PluginImageContainer.tsx
@@ -21,7 +21,10 @@ import { ImageWithFallback } from '../ImageWithFallback'
 const PluginImageContainer = ({ imageProps, fallbackImageClassName }: PluginImageContainerProps) => (
     <ImageWithFallback
         fallbackImage={<ICLegoBlock className={`dc__no-shrink ${fallbackImageClassName}`} />}
-        imageProps={imageProps}
+        imageProps={{
+            loading: 'lazy',
+            ...imageProps,
+        }}
     />
 )
 
diff --git a/src/Shared/Components/Plugin/service.tsx b/src/Shared/Components/Plugin/service.tsx
index a943bb686..1dc8ae23f 100644
--- a/src/Shared/Components/Plugin/service.tsx
+++ b/src/Shared/Components/Plugin/service.tsx
@@ -36,12 +36,14 @@ export const getPluginsDetail = async ({
     pluginIds,
     signal,
     shouldShowError = true,
+    parentPluginIdentifiers,
 }: PluginDetailServiceParamsType): Promise<Pick<GetPluginStoreDataReturnType, 'pluginStore'>> => {
     try {
         const payload: PluginDetailPayloadType = {
             appId,
             parentPluginId: parentPluginIds,
             pluginId: pluginIds,
+            parentPluginIdentifier: parentPluginIdentifiers ? `${parentPluginIdentifiers}` : null,
         }
 
         const { result } = await get<PluginDetailDTO>(
@@ -115,7 +117,13 @@ export const getAvailablePluginTags = async (appId: number): Promise<string[]> =
     }
 }
 
-export const getParentPluginList = async (appId?: number): Promise<ResponseType<MinParentPluginDTO[]>> => {
-    const queryParams: GetParentPluginListPayloadType = { appId }
-    return get<MinParentPluginDTO[]>(getUrlWithSearchParams(ROUTES.PLUGIN_LIST_MIN, queryParams))
+export const getParentPluginList = async (
+    params?: Partial<GetParentPluginListPayloadType>,
+): Promise<ResponseType<MinParentPluginDTO[]>> => {
+    const response = await get<MinParentPluginDTO[]>(getUrlWithSearchParams(ROUTES.PLUGIN_LIST_MIN, params))
+
+    return {
+        ...response,
+        result: (response?.result ?? []).sort((a, b) => stringComparatorBySortOrder(a.name, b.name)),
+    }
 }
diff --git a/src/Shared/Components/Plugin/types.ts b/src/Shared/Components/Plugin/types.ts
index 4b1b0494f..972c2f8d2 100644
--- a/src/Shared/Components/Plugin/types.ts
+++ b/src/Shared/Components/Plugin/types.ts
@@ -15,7 +15,7 @@
  */
 
 import { MutableRefObject } from 'react'
-import { VariableType } from '../../../Common'
+import { ConsequenceType, VariableType } from '../../../Common'
 import { BaseFilterQueryParams } from '../../types'
 import { ImageWithFallbackProps } from '../ImageWithFallback'
 import { getPluginStoreData } from './service'
@@ -30,7 +30,9 @@ export interface PluginAPIBaseQueryParamsType {
 }
 
 export interface GetPluginTagsPayloadType extends PluginAPIBaseQueryParamsType {}
-export interface GetParentPluginListPayloadType extends PluginAPIBaseQueryParamsType {}
+export interface GetParentPluginListPayloadType extends PluginAPIBaseQueryParamsType {
+    type?: 'ALL'
+}
 
 export interface PluginTagNamesDTO {
     tagNames: string[]
@@ -73,7 +75,7 @@ export interface ParentPluginDTO {
     pluginIdentifier: string
 }
 
-export interface MinParentPluginDTO extends Pick<ParentPluginDTO, 'id' | 'name' | 'icon'> {}
+export interface MinParentPluginDTO extends Pick<ParentPluginDTO, 'id' | 'name' | 'icon' | 'pluginIdentifier'> {}
 
 export interface PluginDetailDTO {
     parentPlugins: ParentPluginDTO[]
@@ -84,6 +86,7 @@ export interface PluginDetailServiceParamsType {
     appId: number
     pluginIds?: number[]
     parentPluginIds?: number[]
+    parentPluginIdentifiers?: string[]
     /**
      * @default true
      */
@@ -94,13 +97,14 @@ export interface PluginDetailServiceParamsType {
 export interface PluginDetailPayloadType extends Pick<PluginDetailServiceParamsType, 'appId'> {
     pluginId?: PluginDetailServiceParamsType['pluginIds']
     parentPluginId?: PluginDetailServiceParamsType['parentPluginIds']
+    parentPluginIdentifier?: PluginDetailServiceParamsType['parentPluginIdentifiers'][number]
 }
 
 export interface PluginListFiltersType extends Pick<BaseFilterQueryParams<unknown>, 'searchKey'> {
     selectedTags: string[]
 }
 
-interface ParentPluginType
+export interface ParentPluginType
     extends Pick<ParentPluginDTO, 'id' | 'name' | 'description' | 'type' | 'icon' | 'pluginIdentifier'> {
     latestVersionId: MinimalPluginVersionDataDTO['id']
     pluginVersions: MinimalPluginVersionDataDTO[]
@@ -108,10 +112,7 @@ interface ParentPluginType
 
 interface DetailedPluginVersionType
     extends Pick<MinimalPluginVersionDataDTO, 'id' | 'description' | 'name' | 'pluginVersion'>,
-        Pick<
-            DetailedPluginVersionDTO,
-            'tags' | 'isLatest' | 'inputVariables' | 'outputVariables' | 'updatedBy' | 'docLink'
-        >,
+        Pick<DetailedPluginVersionDTO, 'tags' | 'inputVariables' | 'outputVariables' | 'updatedBy' | 'docLink'>,
         Pick<ParentPluginType, 'icon' | 'type' | 'pluginIdentifier'> {
     parentPluginId: ParentPluginType['id']
 }
@@ -249,3 +250,20 @@ export interface PluginTagsContainerProps {
 export interface PluginImageContainerProps extends Pick<ImageWithFallbackProps, 'imageProps'> {
     fallbackImageClassName?: string
 }
+
+export enum PipelineStageTaskActionModalType {
+    DELETE = 'DELETE',
+    MOVE_PLUGIN = 'MOVE_PLUGIN',
+}
+
+export interface PipelineStageTaskActionModalStateType {
+    type: PipelineStageTaskActionModalType
+    pluginId: PluginDetailType['id']
+    taskIndex: number
+}
+
+export interface MandatoryPluginBaseStateType {
+    isOffendingMandatoryPlugin: boolean
+    isTriggerBlocked: boolean
+    pluginBlockState: ConsequenceType
+}
diff --git a/src/Shared/Components/Plugin/utils.tsx b/src/Shared/Components/Plugin/utils.tsx
index e8b6c1b21..271939a7c 100644
--- a/src/Shared/Components/Plugin/utils.tsx
+++ b/src/Shared/Components/Plugin/utils.tsx
@@ -84,7 +84,6 @@ export const parsePluginDetailsDTOIntoPluginStore = (pluginData: ParentPluginDTO
                     plugin.type === PluginCreationType.SHARED ? pluginVersionData.updatedBy : DEFAULT_PLUGIN_CREATED_BY,
                 outputVariables: pluginVersionData.outputVariables || [],
                 inputVariables: pluginVersionData.inputVariables || [],
-                isLatest: pluginVersionData.isLatest || false,
                 tags: sortedUniqueTags,
                 parentPluginId: plugin.id,
                 icon: plugin.icon || '',
diff --git a/src/Shared/Components/SelectPicker/SelectPicker.component.tsx b/src/Shared/Components/SelectPicker/SelectPicker.component.tsx
index bf0e9bcdf..ee7e90ff1 100644
--- a/src/Shared/Components/SelectPicker/SelectPicker.component.tsx
+++ b/src/Shared/Components/SelectPicker/SelectPicker.component.tsx
@@ -14,14 +14,7 @@
  * limitations under the License.
  */
 
-import {
-    ControlProps,
-    GroupHeadingProps,
-    MultiValueProps,
-    OptionProps,
-    ValueContainerProps,
-    MenuPlacement,
-} from 'react-select'
+import { GroupHeadingProps, MultiValueProps, OptionProps, ValueContainerProps, MenuPlacement } from 'react-select'
 import CreatableSelect from 'react-select/creatable'
 import { ReactElement, useCallback, useMemo } from 'react'
 
@@ -213,9 +206,10 @@ const SelectPicker = <OptionValue, IsMulti extends boolean>({
     isCreatable = false,
     onCreateOption,
     closeMenuOnSelect = false,
+    shouldShowNoOptionsMessage = true,
     ...props
 }: SelectPickerProps<OptionValue, IsMulti>) => {
-    const { inputId, required, isDisabled, controlShouldRenderValue = true, value, options } = props
+    const { inputId, required, isDisabled, controlShouldRenderValue = true, value, options, getOptionValue } = props
     const { isGroupHeadingSelectable = false, getIsOptionValid = () => true } = multiSelectProps
 
     // Only large variant is supported for multi select picker
@@ -252,18 +246,12 @@ const SelectPicker = <OptionValue, IsMulti extends boolean>({
                 value as SelectPickerOptionType<OptionValue>[],
                 trimmedInput as OptionValue,
                 null,
+                getOptionValue,
             ) &&
-            !getSelectPickerOptionByValue<OptionValue>(options, trimmedInput as OptionValue, null)
+            !getSelectPickerOptionByValue<OptionValue>(options, trimmedInput as OptionValue, null, getOptionValue)
         )
     }
 
-    const renderControl = useCallback(
-        (controlProps: ControlProps<SelectPickerOptionType<OptionValue>>) => (
-            <SelectPickerControl {...controlProps} icon={icon} showSelectedOptionIcon={shouldShowSelectedOptionIcon} />
-        ),
-        [icon, shouldShowSelectedOptionIcon],
-    )
-
     const renderValueContainer = useCallback(
         (valueContainerProps: ValueContainerProps<SelectPickerOptionType<OptionValue>>) => (
             <SelectPickerValueContainer
@@ -298,7 +286,11 @@ const SelectPicker = <OptionValue, IsMulti extends boolean>({
             return <GenericSectionErrorState reload={reloadOptionList} />
         }
 
-        return <p className="m-0 cn-7 fs-13 fw-4 lh-20 py-6 px-8">No options</p>
+        if (shouldShowNoOptionsMessage) {
+            return <p className="m-0 cn-7 fs-13 fw-4 lh-20 py-6 px-8">No options</p>
+        }
+
+        return null
     }
 
     const renderDisabledTippy = (children: ReactElement) => (
@@ -381,7 +373,7 @@ const SelectPicker = <OptionValue, IsMulti extends boolean>({
                                 IndicatorSeparator: null,
                                 LoadingIndicator: SelectPickerLoadingIndicator,
                                 DropdownIndicator: SelectPickerDropdownIndicator,
-                                Control: renderControl,
+                                Control: SelectPickerControl,
                                 Option: renderOption,
                                 MenuList: SelectPickerMenuList,
                                 ClearIndicator: SelectPickerClearIndicator,
@@ -399,6 +391,8 @@ const SelectPicker = <OptionValue, IsMulti extends boolean>({
                             renderMenuListFooter={!optionListError && renderMenuListFooter}
                             inputValue={inputValue}
                             onInputChange={onInputChange}
+                            icon={icon}
+                            showSelectedOptionIcon={shouldShowSelectedOptionIcon}
                         />
                     </div>
                 </ConditionalWrap>
diff --git a/src/Shared/Components/SelectPicker/common.tsx b/src/Shared/Components/SelectPicker/common.tsx
index 83771f797..40213de23 100644
--- a/src/Shared/Components/SelectPicker/common.tsx
+++ b/src/Shared/Components/SelectPicker/common.tsx
@@ -80,13 +80,12 @@ export const SelectPickerClearIndicator = <OptionValue,>(
     </components.ClearIndicator>
 )
 
-export const SelectPickerControl = <OptionValue, IsMulti extends boolean>({
-    icon,
-    showSelectedOptionIcon,
-    ...props
-}: ControlProps<SelectPickerOptionType<OptionValue>> &
-    Pick<SelectPickerProps<OptionValue, IsMulti>, 'icon' | 'showSelectedOptionIcon'>) => {
-    const { children, getValue } = props
+export const SelectPickerControl = <OptionValue,>(props: ControlProps<SelectPickerOptionType<OptionValue>>) => {
+    const {
+        children,
+        getValue,
+        selectProps: { icon, showSelectedOptionIcon },
+    } = props
     const { startIcon, endIcon } = getValue()?.[0] ?? {}
 
     let iconToDisplay: SelectPickerOptionType<OptionValue>['startIcon'] = icon
@@ -173,7 +172,7 @@ export const SelectPickerOption = <OptionValue, IsMulti extends boolean>({
                     )}
                     <div className={`flex left w-100 ${showDescription ? 'top' : ''} dc__gap-8`}>
                         {startIcon && (
-                            <div className="dc__no-shrink icon-dim-20 flex dc__fill-available-space">{startIcon}</div>
+                            <div className="dc__no-shrink icon-dim-16 flex dc__fill-available-space">{startIcon}</div>
                         )}
                         <div className="flex-grow-1">
                             <h4 className={`m-0 fs-13 ${isCreatableOption ? 'cb-5' : 'cn-9'} fw-4 lh-20 dc__truncate`}>
@@ -192,7 +191,7 @@ export const SelectPickerOption = <OptionValue, IsMulti extends boolean>({
                                 ))}
                         </div>
                         {endIcon && (
-                            <div className="dc__no-shrink icon-dim-20 flex dc__fill-available-space">{endIcon}</div>
+                            <div className="dc__no-shrink icon-dim-16 flex dc__fill-available-space">{endIcon}</div>
                         )}
                     </div>
                 </div>
@@ -228,7 +227,7 @@ export const SelectPickerMultiValueLabel = <OptionValue, IsMulti extends boolean
     Pick<SelectPickerProps<OptionValue, IsMulti>['multiSelectProps'], 'getIsOptionValid'>) => {
     const { data, selectProps } = props
     const isOptionValid = getIsOptionValid(data)
-    const iconToDisplay = isOptionValid ? data.startIcon || data.endIcon : <ICErrorExclamation />
+    const iconToDisplay = isOptionValid ? ((data.startIcon || data.endIcon) ?? null) : <ICErrorExclamation />
 
     return (
         <div className="flex dc__gap-4 mw-0 dc__truncate">
diff --git a/src/Shared/Components/SelectPicker/type.ts b/src/Shared/Components/SelectPicker/type.ts
index 8506813c3..1745c3b39 100644
--- a/src/Shared/Components/SelectPicker/type.ts
+++ b/src/Shared/Components/SelectPicker/type.ts
@@ -73,6 +73,17 @@ declare module 'react-select/base' {
          * Imp Note: The menu open/close needs to handled by the consumer in this case
          */
         renderCustomOptions?: () => ReactElement
+        /**
+         * Icon to be rendered in the control
+         */
+        icon?: ReactElement
+        /**
+         * If true, the selected option icon is shown in the container.
+         * startIcon has higher priority than endIcon.
+         *
+         * @default 'true'
+         */
+        showSelectedOptionIcon?: boolean
     }
 }
 
@@ -108,13 +119,18 @@ export type SelectPickerProps<OptionValue = number | string, IsMulti extends boo
     | 'autoFocus'
     | 'onBlur'
     | 'onKeyDown'
+    | 'formatOptionLabel'
     | 'onInputChange'
     | 'inputValue'
 > &
     Partial<
         Pick<
             SelectProps<OptionValue, IsMulti>,
-            'renderMenuListFooter' | 'shouldRenderCustomOptions' | 'renderCustomOptions'
+            | 'renderMenuListFooter'
+            | 'shouldRenderCustomOptions'
+            | 'renderCustomOptions'
+            | 'icon'
+            | 'showSelectedOptionIcon'
         >
     > &
     Required<Pick<SelectProps<OptionValue, IsMulti>, 'inputId'>> &
@@ -128,10 +144,6 @@ export type SelectPickerProps<OptionValue = number | string, IsMulti extends boo
             'onCreateOption'
         >
     > & {
-        /**
-         * Icon to be rendered in the control
-         */
-        icon?: ReactElement
         /**
          * Error message for the select
          */
@@ -144,13 +156,6 @@ export type SelectPickerProps<OptionValue = number | string, IsMulti extends boo
          * Label for the select. if required is added, the corresponding * is also added
          */
         label?: ReactNode
-        /**
-         * If true, the selected option icon is shown in the container.
-         * startIcon has higher priority than endIcon.
-         *
-         * @default 'true'
-         */
-        showSelectedOptionIcon?: boolean
         /**
          * Custom selected options count for use cases like filters
          */
@@ -225,6 +230,14 @@ export type SelectPickerProps<OptionValue = number | string, IsMulti extends boo
          * @default false
          */
         isCreatable?: boolean
+        /**
+         * If false, the no options message is not shown
+         *
+         * Note: Handling for the menu distortion needs to be handled explicitly in this case
+         *
+         * @default true
+         */
+        shouldShowNoOptionsMessage?: boolean
     } & (IsMulti extends true
         ? {
               isMulti: IsMulti | boolean
@@ -266,6 +279,7 @@ export interface FilterSelectPickerProps
             | 'shouldMenuAlignRight'
             | 'optionListError'
             | 'reloadOptionList'
+            | 'getOptionValue'
             | 'isOptionDisabled'
         > {
     appliedFilterOptions: SelectPickerOptionType[]
diff --git a/src/Shared/Components/SelectPicker/utils.ts b/src/Shared/Components/SelectPicker/utils.ts
index 4d39f3164..c8b9b471b 100644
--- a/src/Shared/Components/SelectPicker/utils.ts
+++ b/src/Shared/Components/SelectPicker/utils.ts
@@ -349,36 +349,28 @@ export const getGroupCheckboxValue = <OptionValue>(
  * @param optionsList - The list of options or groups of options.
  * @param value - The value to compare against the options' values.
  * @param defaultOption - The default option to return if no match is found.
+ * @param getOptionValue - Override the default value for the option
  * @returns The matched option or the default option if no match is found.
  */
 export const getSelectPickerOptionByValue = <OptionValue>(
     optionsList: OptionsOrGroups<SelectPickerOptionType<OptionValue>, GroupBase<SelectPickerOptionType<OptionValue>>>,
     value: OptionValue,
     defaultOption: SelectPickerOptionType<OptionValue> = { label: '', value: '' as unknown as OptionValue },
+    getOptionValue: SelectPickerProps<OptionValue>['getOptionValue'] = null,
 ): SelectPickerOptionType<OptionValue> => {
     if (!Array.isArray(optionsList)) {
         return defaultOption
     }
 
-    const foundOption = optionsList.reduce(
-        (acc, curr) => {
-            if (!acc.notFound) return acc
+    const flatOptionsList = optionsList.flatMap<SelectPickerOptionType<OptionValue>>((groupOrBaseOption) =>
+        'options' in groupOrBaseOption ? groupOrBaseOption.options : [groupOrBaseOption],
+    )
 
-            if ('value' in curr && curr.value === value) {
-                return { data: curr, notFound: false }
-            }
-
-            if ('options' in curr && curr.options) {
-                const nestedOption = curr.options.find(({ value: _value }) => _value === value)
-                if (nestedOption) {
-                    return { data: nestedOption, notFound: false }
-                }
-            }
-
-            return acc
-        },
-        { notFound: true, data: defaultOption },
-    ).data
+    return (
+        flatOptionsList.find((option) => {
+            const optionValue = getOptionValue ? getOptionValue(option) : option.value
 
-    return foundOption
+            return optionValue === value
+        }) ?? defaultOption
+    )
 }
diff --git a/src/Shared/Hooks/useGetResourceKindsOptions/service.ts b/src/Shared/Hooks/useGetResourceKindsOptions/service.ts
index c67f29585..e4c9ebf64 100644
--- a/src/Shared/Hooks/useGetResourceKindsOptions/service.ts
+++ b/src/Shared/Hooks/useGetResourceKindsOptions/service.ts
@@ -18,11 +18,11 @@ import { ResponseType, Teams } from '@Common/Types'
 import { getTeamListMin } from '@Common/Common.service'
 import { get } from '@Common/Api'
 import { ClusterType } from '@Shared/Services'
-import { EnvironmentType, EnvListMinDTO } from '@Shared/types'
+import { EnvListMinDTO } from '@Shared/types'
 import { EnvironmentTypeEnum } from '@Shared/constants'
 import { ROUTES } from '@Common/Constants'
 import { stringComparatorBySortOrder } from '@Shared/Helpers'
-import { AppsGroupedByProjectsType, ClusterDTO } from './types'
+import { AppsGroupedByProjectsType, ClusterDTO, EnvironmentsGroupedByClustersType } from './types'
 
 export const getAppOptionsGroupedByProjects = async (): Promise<AppsGroupedByProjectsType> => {
     const { result } = (await get(ROUTES.APP_LIST_MIN)) as ResponseType<AppsGroupedByProjectsType>
@@ -70,14 +70,14 @@ export const getClusterOptions = async (): Promise<ClusterType[]> => {
         .sort((a, b) => stringComparatorBySortOrder(a.name, b.name))
 }
 
-export const getEnvironmentOptions = async (): Promise<EnvironmentType[]> => {
+export const getEnvironmentOptionsGroupedByClusters = async (): Promise<EnvironmentsGroupedByClustersType> => {
     const { result } = (await get(ROUTES.ENVIRONMENT_LIST_MIN)) as ResponseType<EnvListMinDTO[]>
 
     if (!result) {
         return []
     }
 
-    return result
+    const sortedEnvList = result
         .map(
             ({
                 id,
@@ -96,4 +96,23 @@ export const getEnvironmentOptions = async (): Promise<EnvironmentType[]> => {
             }),
         )
         .sort((a, b) => stringComparatorBySortOrder(a.name, b.name))
+
+    const envGroupedByCluster = Object.values(
+        sortedEnvList.reduce<
+            Record<EnvironmentsGroupedByClustersType[number]['clusterName'], EnvironmentsGroupedByClustersType[number]>
+        >((acc, env) => {
+            if (!acc[env.cluster]) {
+                acc[env.cluster] = {
+                    clusterName: env.cluster,
+                    envList: [],
+                }
+            }
+
+            acc[env.cluster].envList.push(env)
+
+            return acc
+        }, {}),
+    ).sort((a, b) => stringComparatorBySortOrder(a.clusterName, b.clusterName))
+
+    return envGroupedByCluster
 }
diff --git a/src/Shared/Hooks/useGetResourceKindsOptions/types.ts b/src/Shared/Hooks/useGetResourceKindsOptions/types.ts
index 7c72b8492..f87d9db7e 100644
--- a/src/Shared/Hooks/useGetResourceKindsOptions/types.ts
+++ b/src/Shared/Hooks/useGetResourceKindsOptions/types.ts
@@ -16,9 +16,9 @@
 
 // ====== Service Types: Start ====== //
 
-import { ResourceKindType } from '@Shared/types'
+import { EnvironmentType, ResourceKindType } from '@Shared/types'
 import { ServerErrors } from '@Common/ServerError'
-import { getAppOptionsGroupedByProjects, getClusterOptions, getEnvironmentOptions, getProjectOptions } from './service'
+import { getAppOptionsGroupedByProjects, getClusterOptions, getProjectOptions } from './service'
 
 export interface AppType {
     name: string
@@ -30,6 +30,11 @@ export type AppsGroupedByProjectsType = {
     appList: AppType[]
 }[]
 
+export type EnvironmentsGroupedByClustersType = {
+    clusterName: EnvironmentType['cluster']
+    envList: EnvironmentType[]
+}[]
+
 export interface ClusterDTO {
     id: number
     cluster_name: string
@@ -54,7 +59,7 @@ export interface UseGetResourceKindOptionsReturnType {
         [ResourceKindType.devtronApplication]: Awaited<ReturnType<typeof getAppOptionsGroupedByProjects>>
         [ResourceKindType.project]: Awaited<ReturnType<typeof getProjectOptions>>
         [ResourceKindType.cluster]: Awaited<ReturnType<typeof getClusterOptions>>
-        [ResourceKindType.environment]: Awaited<ReturnType<typeof getEnvironmentOptions>>
+        [ResourceKindType.environment]: EnvironmentsGroupedByClustersType
     }
     resourcesOptionsError: ServerErrors
     refetchResourcesOptions: () => void
diff --git a/src/Shared/Hooks/useGetResourceKindsOptions/useGetResourceKindsOptions.tsx b/src/Shared/Hooks/useGetResourceKindsOptions/useGetResourceKindsOptions.tsx
index 104eaa689..4bd2f3829 100644
--- a/src/Shared/Hooks/useGetResourceKindsOptions/useGetResourceKindsOptions.tsx
+++ b/src/Shared/Hooks/useGetResourceKindsOptions/useGetResourceKindsOptions.tsx
@@ -17,7 +17,12 @@
 import { useMemo } from 'react'
 import { ResourceKindType } from '@Shared/types'
 import { useAsync } from '@Common/Helper'
-import { getAppOptionsGroupedByProjects, getClusterOptions, getEnvironmentOptions, getProjectOptions } from './service'
+import {
+    getAppOptionsGroupedByProjects,
+    getClusterOptions,
+    getEnvironmentOptionsGroupedByClusters,
+    getProjectOptions,
+} from './service'
 import { UseGetResourceKindOptionsReturnType, UseGetResourceKindsOptionsProps } from './types'
 import { getResourcesToFetchMap } from './utils'
 
@@ -43,7 +48,7 @@ const useGetResourceKindsOptions = ({
                 resourcesToFetchMap[ResourceKindType.devtronApplication] ? getAppOptionsGroupedByProjects() : null,
                 resourcesToFetchMap[ResourceKindType.project] ? getProjectOptions() : null,
                 resourcesToFetchMap[ResourceKindType.cluster] ? getClusterOptions() : null,
-                resourcesToFetchMap[ResourceKindType.environment] ? getEnvironmentOptions() : null,
+                resourcesToFetchMap[ResourceKindType.environment] ? getEnvironmentOptionsGroupedByClusters() : null,
             ]),
         [resourcesToFetchMap],
         resourcesToFetch.length > 0,
diff --git a/src/Shared/Services/ToastManager/toastManager.scss b/src/Shared/Services/ToastManager/toastManager.scss
index 141a9a118..deaa36eb2 100644
--- a/src/Shared/Services/ToastManager/toastManager.scss
+++ b/src/Shared/Services/ToastManager/toastManager.scss
@@ -47,8 +47,9 @@
     &__content {
 
         // Override the style for the action button
-        button {
+        button.button, a.button {
             color: var(--N0);
+            width: fit-content;
 
             svg *[stroke^="#"] {
                 stroke: var(--N0);
diff --git a/src/Shared/types.ts b/src/Shared/types.ts
index 42082ea2e..3cd3a1fa8 100644
--- a/src/Shared/types.ts
+++ b/src/Shared/types.ts
@@ -440,6 +440,7 @@ export enum ResourceKindType {
     installation = 'installation',
     environment = 'environment',
     cdPipeline = 'cd-pipeline',
+    ciPipeline = 'ci-pipeline',
     project = 'project',
 }
 
@@ -462,6 +463,8 @@ export interface SeverityCount {
 }
 export enum PolicyKindType {
     lockConfiguration = 'lock-configuration',
+    imagePromotion = 'image-promotion',
+    plugins = 'plugin',
 }
 
 export interface LastExecutionResultType {
diff --git a/src/Shared/validations.tsx b/src/Shared/validations.tsx
index 4a8454c5f..d6fc0edc7 100644
--- a/src/Shared/validations.tsx
+++ b/src/Shared/validations.tsx
@@ -32,6 +32,8 @@ export const MESSAGES = {
     VALID_POSITIVE_INTEGER: 'This field should be a valid positive integer',
     MAX_SAFE_INTEGER: `Maximum allowed value is ${Number.MAX_SAFE_INTEGER}`,
     INVALID_SEMANTIC_VERSION: 'Please follow semantic versioning',
+    INVALID_DATE: 'Please enter a valid date',
+    DATE_BEFORE_CURRENT_TIME: 'The date & time cannot be before the current time',
 }
 
 const MAX_DESCRIPTION_LENGTH = 350
@@ -342,3 +344,24 @@ export const validateJSON = (json: string): ValidationResponseType => {
         }
     }
 }
+
+export const validateDateAndTime = (date: Date): ValidationResponseType => {
+    if (date) {
+        const currentDate = new Date()
+        if (currentDate.getTime() > date.getTime()) {
+            return {
+                isValid: false,
+                message: MESSAGES.DATE_BEFORE_CURRENT_TIME,
+            }
+        }
+    } else {
+        return {
+            isValid: false,
+            message: MESSAGES.INVALID_DATE,
+        }
+    }
+
+    return {
+        isValid: true,
+    }
+}
diff --git a/src/index.ts b/src/index.ts
index a5464716a..c12bae121 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -76,6 +76,7 @@ export interface customEnv {
     SYSTEM_CONTROLLER_LISTING_TIMEOUT?: number
     FEATURE_STEP_WISE_LOGS_ENABLE?: boolean
     FEATURE_IMAGE_PROMOTION_ENABLE?: boolean
+    FEATURE_CD_MANDATORY_PLUGINS_ENABLE?: boolean
     /**
      * If true, the direct permissions are hidden for non-super admins in user permissions
      *