#EA-57837 fixed
#EA-57835 fixed
Attempt to fix EA-57678
Merge remote-tracking branch 'origin/master'