Fixes: #2731 shorten diff with 1.1 branch