WIP: Misc fixes

1. replaces #7605  and #7389
2. add deprecation for iter_basic_args method