spot pushed to tkimg (master). "fix FTBFS"