Importing from deployment server

Found this changes on deployment server. Importing.