Applied OTM changes from commit 2535090d1bfce9fe94f94c8b0e46c21c68fed0e5
in master