Pre-merge from Beta branch - 201410