First of many changes to be merged to long-feature
Another commit to be merged to 'long-feature'
Final improvements to be merged to 'long-feature'