Merge "Added grompp warning" into release-4-6