Add unmerged changes from past few months.