integrate comments by @octo