Merge remote-tracking branch 'origin/23603-add-extra-functionality-for-the-top-right-plus-button' into 23603-add-extra-functionality-for-the-top-right-plus-button
