Loading custom stylesheet last
Merge changes from upstream ESSENTIAL_254 (conflicts resolved)