Merge pull request #1429 from shenki/legacy-kernel-bump

Legacy kernel bump