[defaults] [fix] if session is set, only then set get_defaults_for_match
Merge branch 'master' into edge