Merge "Handle atomic formula max value size"