Merge "FRM performance refactoring: * Interface definitions for FRM functionality...