Merge "Advanced apps updates (2/2)" into mnc-dev