Merge "Fix for inputsize calculation" into main