Merged type stuff with new Type rectangles
Merge remote-tracking branch 'origin/master'
Merge