Manually merging #1796 : Feature/#1752 bolt backend theme