Merge branch 'asoper29-master'