Updates to CUB's layout - improvements on Layer4
Updates to CUB's layout - improvements on Layer8
Merge remote-tracking branch 'upstream/cub_layout' into mymap