Based on the meeting with Salvatore
Merge pull request #6483 from ASvyatkovskiy/OnlyCondFormat

Changes in the CondFormat (Only) necessary for migration to 6x6 APE