[fixed] Mantis 3076: Eopie lair type

Change-Id: I596f3e3cecc8bf58e0a5b7165122755d518ab96d
Merge "[fixed] Mantis 3076: Eopie lair type" into unstable