[ #6 ] create avoiding prompt feature
Merge branch 'feature/avoid_prompt_#6' into develop