[TASK] Merged master, fixed conflict