[PLAT-4596] Take into account CLOSE value if available