Merge pull request #977 from etienne-lms/sp-min-fiq