Merge "Bug fixes for casablanca"