Made ready for rev 1126+