Merge "Start of Minikin integration"