Simplified scriptlet extensions
Merge branch '1.1'