Merge "Features tweaks:" into arc-apps