CAP-114 #comment implemented #update implemented in dev branch