CAAERS-6622 externalizing to build time local properties
merge commits