Merged master into develop and resolved conflicts