merge latest changes from Countly master