second - from source tree
Merge commit 'b50cd206b4a13865a3118f8d8e8970cf432171a2'