Final changes and integration done for 21-sep-2014