Adding the POR-6123 issue