TRUNK-257 - rebase with upstrem master