merged with Povilozauras commit