Merge branch 'master' into 'LivingApp_stab'
Merge branch 'LivingApp_stab' into 'master'