StartUp Script: Use BlockDev to unlock the system partition device
Merge remote-tracking branch 'origin/3.x' into 3.x