Merge "Better handling for hal version 1.1"