Merge master version 1.0.1 to development

Also fixed missing requirement for common mixin