[#1536] Lighthouse 1536 patch

Dev on branch lighthouse-1536-patch