Added from development/jgr