Merge pull request #6411 from ctzsnooze/Dynamic_Notch_Update