Apply feedback
Merge branch 'feedback'

* feedback:
  Apply feedback