Improve table alignment
Add support for non-feature branches
Merge branch 'master' into cr-shipMergeMaster