refactoring (applying again after merge) https://softinstigate.atlassian.net/browse/RH-200
refactoring (applying again after merge)
https://softinstigate.atlassian.net/browse/RH-200

SoftInstigate/restheart,SoftInstigate/restheart,SoftInstigate/restheart,SoftInstigate/restheart