Merge "fconf: spm: minor bug fix" into integration