closes #1363 Change-Id: I4aac5096fd18067b3503e834a687277e7d5903fb (cherry picked from commit fd064304bb)
fd064304bb