Preparation for transition to the latest Catel version