Port to 1.5.1

Outcommented my added code. Will create a seperate branch for PR later ;)