merge dev into PODR-374