Merge "Revert "Add Overloads to Frame and Image Extract Functions"" into main