Pics
A merge including some fixes
Pics
Another merge
Pics