rebasing to bricked-pyramid kernel