Updated Refinements From Webplate Update

- These are changes committed by Oleg Kalandarashvili.