Resolves #1311 Resolves #1343 Addressing PR review comments Addressing PR review comments Addressing PR review comments Addressing PR review comments