Bugfix on HP
Merge commit 'f11fe696e5cb96b17ff503704162e4718d536473' into Master
Merge remote-tracking branch 'upstream/Master'