Merge branch 'master', remote-tracking branch 'origin' into CDB-1465
fixed updating forms when there is no properties CDB-1465
merged with master
Merge CDB-1465 into release/2.8.2