3.1-Dev Branch For Review

Hi @bloom

I can confirm the chanelog and erd have been updated :+1: