Compiled changes from b801449b28