Merge branch 'NLPCRAFT-414'