Merge 2196

This pr simply merges #2196 with the current master.