merge #d09cd7a changes from gason project.