10 Commits (CLDC-2454-add-q90-based-on-q78)