Merge "Remove use of setFast* properties"