missing commit to master #3487