Commit 3.5 Description: Bug fixes[5]