Merge "Removing line submited by mistake." into tm-dev