Merge branch 'features/openrc-console' into 'develop'