Merge "Apex: adds smoketest back"