sync with trunk (mergeinfo props only)