Merge latest features to production branch