Diff baselayout-2.14 with a baselayout-2.18-r1

Thank you!