Merge 'feature-coloured-logging-bryan' into 'dev'