Fix cds schema xml, invalid Properties form container.
Try to improve timing for show/hide empty
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' into fb_style