Mandril v1
Merge branch 'Mandrill' into dev-260714-0525