commit na 03/06