Merge "enable sparky to interact with schema ms and aaf"