merged SLE-12-GA branch