Merge branch 'refactor/use-constants' into 'develop'