Merge pull request #4951 from peugeot/beeg