Commit 3.4 Description: Bug fixes[4]