ANI-1690: Serenity

Owned by petra128