Merge "Fix version plugin issue"