merge from regneq:master