Merge feat/raspi into dev for beerpong feature