Apply fix from master to Dev branch so it won't get lost