Recommit changes from tosiara commit 9ebee031