Merge changes from  OpenNingia