Refs #135: delay enough time to make sure test pass always
Refs #135: add 'const' qualifier back
Refs #135: rollback
Refs #135: add 'const' qualifier where applicable
Refs #135 Merge upstream branch '3.x' into gh135
Merge branch '3.x' into gh135
Refs #135 - synced gh135 with 3.x
Merge branch 'gh135' into 3.x