Merge "issue :HAL is still available from the last session" into fm.lnx.2.9.1