realign from trunk - new BindingTrail performance.