Merge branch 'tkm-spi-label'