Merge "Change to use setupdesign library"