Added todo
Added comment
Added todo
Added release notes
Merge branch 'release/3.0' into develop