Merge branch 'resume-sci-force-bootparam' into release