Fix for absolute
Merge commit '4f84dbdd1881406e078bb5f1cb07e6309c9d091a' into alpha2