[mac/f23] (4 commits) ...add patch