Bug-fix:

 - Cherry-picked commit from master