TRUNK-2984 ver 2