Merge "Added additional strings for fpm" into sc-dev