Merge latest Phil updates