Resolved conflicts of merging master into branch