Fixed included features

Change-Id: Ia1c7b76b8c4ded09d45dbdaf0cbe400edb195ab2