Merge "Add additional picture parameter" into main