Merge "Initial integration of Minikin to framework"