FLOE-116: fixed include
Merge branch 'FLOE-116' into FLOE-116-broken-resolution