Merge "improved flow-type model"