* Updating from external repo * Updating from external repo * Revert "Updating from external repo" This reverts commit058e6bc5ec. * Revert "Updating from external repo" This reverts commitac5cd98a89. * Updating from external repo * Changes for 2.4.9