New patch

Merge