Merge "Adjust Manila formula granularity"