Merge from latest dev and create public/contact in order to be able to more easliy merge between the two