manually merged dinukas branch