Merge "Additional tidy up after Features." into arc-apps