TRUNK-287

Another attempt :) @dkayiwa