LPS-37648 SF ( Missed key during the rebase, it should be "Add" instead of "New" - LPS-37602 )