Merge "Fix NPE from dependency initialization order" into tm-qpr-dev