fix conflicts and merge latest improvements from 14#1105

ajibarra merged 2 commits into15.next-cake5CakeDC/users:15.next-cake5from

feature/14-to-15CakeDC/users:feature/14-to-15Copy head branch name to clipboard