Carried over current fixes from 201402 repo.
Several fixes for stability purposes - header