delete feature start
Revert "delete feature start"

This reverts commit fef02c5a1c859938640974af6685a686bd7778f3.
Merge branch 'feature/delete_feature' into develop