ref: refs/heads/1.3_mars_bugfix
