Merging recent changes from SILShack