Merge "Removed all dependencies on FileResolver" into idea133