Update from svn trunk (rBTS5872).