patch feature/ nnk/ align June 3rd