Fixed squished version
Merge remote-tracking branch 'origin/3551' into 3551