PR-1: added ae069c3c14daa5cdef7d56c40cc48888 6