Merge "OOF design framework seed code"