merge fpm-status path changes from 5.3