Fixed conflicts in merge of a5d01b2c4131799d1a834b6b057ca594b37b0714