Merge pull request #1862 from thloh85-intel/s10_bl2