merged changes from fix_logpress