Fork from LORG-Release, unsafe changes and improvements