Merge develop

Updated previous merge request