AG-3866: extracted aspect