Bug 815093 - WIP
Bug 815093 - Some review fix