Merge "qssi:Fix bootup issue"