[sr-dev] git:master:1eb94377: core: review and update/remove old comments