Efq sandbox

Merge EFQ Sandbox into 7.x-1.x branch.