Updated history to reflect merging of #580.
Ensuring that layout is only set to the default value if layout is not specified