development: Vanir Inverted (3/4)

Change-Id: I58cff01d573d38e19ebba509bd0fc9b18b8193fe