3209 dev1

#3209

See QA steps in issue description.