Track AEP's stable branch

And use AEP's prox calib