Changes for alpha7.4