Merge branch 'my_development' into harmonize-SBA-channels