efarProvider

resync for last commit