Merge branch 'rnou/deleteopt' into 'master'

delete opt

optimize delete passing the path

See merge request !308