ALM-612 fixes in the configuration for f1000 and pmc