Adding inheritance fix, updated dev env and demos