Moved from srdrl repo