Merge branch 'zecke/jolly-lapdm-fixes'

* Squashed fix and testcase into one.