Merge branch 'minorchanges' into protocoderL