Merged in c545e316b63bef93ef5459319a15f299e96e1169 with dev-updates