Commit abaa4e5152 on catheacute/external_jbirdvegas_mGerrit