[NGRINDER-703]Synch with master branch