Branches update & things to consider for merging