FIX comments raised in code review
Merge remote-tracking branch 'origin/feature/rpm_develop' into feature/rpm_develop