Fixed merge conflict for #1290 and #1292