merge commit 21050 ("add "patented"-build flag to allow packages being with and witho...