merge master for cap and redis and log release