Merge "Add getters for properties accessed by Flow"