Merge branch 'ticket40282_046_01_squashed'