case-2913 - Facebook position fix
Merge branch 'case-2913' into development