FALCON-588 Baselining designer code. Contributed by samar