7123: LayoutFarm Apache2 license
7124
7127: abstraction1
7131: abstract 2

temp fix,
7133: refactor
7135
7137
7138
7141
Merge branch 'v1.7dev' into v1.7