[mac/f24] (2 commits) ...add patch