commit with /*test comment for merge to master from dev */