Merging topic 1088 1159

just the merge of #1088 and #1159