Pull request 7.34

Please need review and make a tag for it.