chore(app): merge some changes from tasklist

related to #CAM-3124