manual merge with dev branch.
I think it's time to merge dev with this branch