Merge branch 'tr/xsize-bits'