Merging changes, adding some fixes for production side.