Merged changes from Jlyon