Merge branch 'ar/decorate-color'