LPS-44302 (second try)

Hi Manuel,
any method order and different layout is fine for me. Thanks for making it fit the standard. I guess I have to pullrequest it back to you?

Thanks,
Olaf