merging dev into feture/conditions