Merge branch 'builder-note' into 'develop'