[ AREAS-530 ]