Removed/resolved merge conflict
Merge commit 'e46e8bff5e60813572c378c6c327b70ca3ffbf14'