Dev branch merge fix