Merge commit '0123101af0e15221026f97f19dad23488840700a' * commit '0123101af0e15221026f97f19dad23488840700a': Add proper support for fixed position elements