Commit by maor. Thanks.