Merge branch 'lxt-cleanups'