Merge 18 Nov

Merge Current App