Merged topic_bugfix_for700 from repository matteosan1
other fixes