Merge "DO NOT MERGE remove pts" into jb-mr2-dev