Merge branch 'fix-CMP0054-elseif-warning' into release