Final changes to prepare for back-merge to public fpm