Code

Merge branch 'tr/xsize-bits' into maint