common styles for master & ics builds
merge order