merge

merged from otrdiz/devel
Loading properties