Fix missing import after merging master into develop