Feature/rabbit3.3updates