Merge "Fix Boot Failure #1"