Merge branch 'osci_553'