Pull request 271 lps 37304

Rebased and without conflicts. ;)