Based on 2c2f649200ba5b742ba9d17ac5ba553c752b59aa 2019-05-04T10:40:32

Note: This file is to be cleared after each rebase on upstream